Closes#530