FIX: Better check