#15 Fixed callback being double called