Fix for new coverage system