Cleaned up that fix