Fixed Fenoxo/sourceTiTS#215
Fixed Fenoxo/sourceTiTS#216