Fixed #488