Fixed callback bug