Workaround is functional, tested with multiple queries.