Fixing some bug with comment