Fixed getting arrays from context due to recent changes