Bug fix regarding hook pieces