Hopefully final fix for covr