Fixed #478
Fixed #479