Fixed #555