Fix my previous fix