Fixed for cedrus weirdness