off-canvas bug fix.
Merge branch 'develop'