Closes#533