Fix for Hannibal