FIX: boolean support