It looks like hooks are ok now. Closes #319