Closes #2324