Seems like the previous fix wasn't entirely correct