Fixed #359