Fix for hook calling