Fixed #529