Fixed #723