Fixing problem in issue 534.