Fix for introduced issue with sub-query expression