Fix for a fix for a fix