Fixing a critical bug introduced