fixing regression caused in PR#1054