FIX: Quartz fix