Closes #559