fix for bug introduced in previous fix