Cleanup previous fix