Fixed Fenoxo/sourceTiTS#210

Also fixed a mimbrane bug