Fixed a MAJOR bug that caused the wrong callback to be called at times