Closed #563 worked on #562