Fixed a bug caused by commenting certain lines