Closes #530