FIX: Restore functionality