Closes #573