Fix Dimension Crash

Last thing with the bfox's merge.