Closes #1428. For #1255