FIX: Fix which properties