Fixed #563