hooks bugs fixed