Fix Pull #407