Fixed #559