Fixed #575