Added callbacks forward + small bug fix