Bug fix for commenting