Fix for previous fix

Fix for problem introduced in 25f4ce93ac377400f3ee530fbc998b76f00cc899