FIX: pre-patch modal