Previous fix wasn't quite right