Fixed #475