Fixed comment timing bug