Fix for answer controller