Regression fix for commit #646