Fix disabled comment issue