Problem executing an ORDER BY against the ModeShape data source

Exucuting query: Select * From nt_base ORDER BY jcr_path

produces the following exception on the server:

[JDBCExecutionException] 0: Error Code:0 Message:'Column 'jcr_path' does not exist on the table 'g_0'
' error executing statement(s): [SQL: SELECT g_0."jcr:name", g_0."jcr:path", g_0."jcr:primaryType", g_0."jcr:score", g_0."mode:depth", g_0."mode:localName" FROM "nt:base" AS g_0 ORDER BY jcr_path]
1 [SQLException]Column 'jcr_path' does not exist on the table 'g_0'

2 [RepositoryException]Column 'jcr_path' does not exist on the table 'g_0'

at org.teiid.translator.jdbc.JDBCQueryExecution.execute(JDBCQueryExecution.java:88)
at org.teiid.dqp.internal.datamgr.ConnectorWorkItem.execute(ConnectorWorkItem.java:263)
at org.teiid.dqp.internal.process.DataTierTupleSource.getResults(DataTierTupleSource.java:281)
at org.teiid.dqp.internal.process.DataTierTupleSource.access$000(DataTierTupleSource.java:71)
at org.teiid.dqp.internal.process.DataTierTupleSource$1.call(DataTierTupleSource.java:123)
at org.teiid.dqp.internal.process.DataTierTupleSource$1.call(DataTierTupleSource.java:120)
at org.teiid.dqp.internal.process.DQPCore$FutureWork.run(DQPCore.java:108)
at org.teiid.dqp.internal.process.DQPWorkContext.runInContext(DQPWorkContext.java:189)
at org.teiid.dqp.internal.process.ThreadReuseExecutor$RunnableWrapper.run(ThreadReuseExecutor.java:116)
at org.teiid.dqp.internal.process.ThreadReuseExecutor$3.run(ThreadReuseExecutor.java:290)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:637)
Caused by: java.sql.SQLException: Column 'jcr_path' does not exist on the table 'g_0'

And according to my conversation with Steve, we are stripping aliases because modeshape does not support select expressions, but not properly handling the order by.