Fixes #1 fixes callback