FIX: Fix check