FIX: Proper -> Property