FIX: temporary fix for #416