Fix terminator problem