Fixed the fix that broke the original