Fix for undexpected TERMINATOR