Fixed #550