Fixed #653