Fixed: callback not called when done