Fixed broken build Issue#315