Fixed #466