Fixed syntax error found by g++, otherwise same as prev commit