Closes #2189