closes #790, move massert to just one line