Comment location fix