Fixed #535