Make comments work properly