fix to answer callbacks