FIX: Better consistency