case fix
Closes issue #1274 & #1294