[Issue #113] Fixed bug with force legacy option