diff --git a/main/channel.c b/main/channel.c
index b937b41..0ed9204 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1688,6 +1689,9 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
 	ast_channel_unlock(chan);
 
 	switch (chan->_state) {
+	case AST_STATE_DIALING:
+		ast_indicate(chan, AST_CONTROL_RINGING);
+		/* FALL THRU */
 	case AST_STATE_RINGING:
 	case AST_STATE_RING:
 		ast_channel_lock(chan);
@@ -1731,8 +1735,10 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
 		}
 		break;
 	case AST_STATE_UP:
+		ast_debug(2, "Channel %s is already up\n", chan->name);
 		break;
 	default:
+		ast_debug(2, "Channel %s is in state %d\n", chan->name, chan->_state);
 		break;
 	}