diff --git a/include/modval.h b/include/modval.h
index 56a5b1f..04d50fb 100644
--- a/include/modval.h
+++ b/include/modval.h
@@ -342,7 +342,7 @@ extern Function_ptr *global;
 #define get_target_by_refnum (*(char *(*)(unsigned ))global[GET_TARGET_BY_REFNUM])
 #define get_target_cmd_by_refnum (*(char *(*)(u_int))global[GET_TARGET_CMD_BY_REFNUM])
 #define get_window_target_by_desc (*(Window *(*)(char *))global[GET_WINDOW_TARGET_BY_DESC])
-#define is_current_channel (*(int (*)(char *, int , int ))global[IS_CURRENT_CHANNEL])
+#define is_current_channel (*(int (*)(const char *, int , int ))global[IS_CURRENT_CHANNEL])
 #define set_current_channel_by_refnum (*(const char *(*)(unsigned , char *))global[SET_CURRENT_CHANNEL_BY_REFNUM])
 #define get_current_channel_by_refnum (*(char *(*)(unsigned ))global[GET_CURRENT_CHANNEL_BY_REFNUM])
 #define get_refnum_by_window (*(char *(*)(const Window *))global[GET_REFNUM_BY_WINDOW])
diff --git a/include/window.h b/include/window.h
index e230c43..314d65b 100644
--- a/include/window.h
+++ b/include/window.h
@@ -63,7 +63,7 @@
 	char	*BX_get_prompt_by_refnum		(unsigned);
 	char	*BX_get_target_by_refnum		(unsigned);
 	void	BX_set_query_nick			(char *, char *, char *);
-	int	BX_is_current_channel		(char *, int, int);
+	int	BX_is_current_channel		(const char *, int, int);
 const	char	*BX_set_current_channel_by_refnum	(unsigned, char *);
 	char	*BX_get_current_channel_by_refnum	(unsigned);
 	int	BX_is_bound_to_window		(const Window *, const char *);
diff --git a/source/window.c b/source/window.c
index 78519f4..255da32 100644
--- a/source/window.c
+++ b/source/window.c
@@ -1552,9 +1552,8 @@ void set_query_nick(char *nick, char *host, char *cmd)
  * channel and attempt to replace it by a non-current channel or the 
  * current_channel of window specified by value of delete
  */
-int BX_is_current_channel(char *channel, int server, int delete)
+int BX_is_current_channel(const char *channel, int server, int delete)
 {
-
 	Window	*tmp = NULL;
 	int	found = 0;
 
@@ -1572,7 +1571,8 @@ int BX_is_current_channel(char *channel, int server, int delete)
 			}
 		}
 	}
-	return (found);
+
+	return found;
 }
 
 /*