In 6.2.4, some changes were made to fix similar issues for different queries, however, this is still broken in 6.2.4.Final and current 6.3.0-SNAPSHOT