Fixed issue on called hooks