Wokraround for query issue