ensure the previous fix affects 5.5+ only