closes #1254