Fixed callback already called error