Fix issues #72 - Callback already called