Fixed #425