fix CRITICAL bug