[fix] special case for comment token, that starts to get really dirty :(