Fixes callback assignment Bug - see issue #2