A possible solution would be to apply the solution applied here in all other queries in this class.