Fixes issuw with returned results of firstWhere