Keep comment where is should be