A fix that hopefully covers all usage scenarios