Fix

* Fixed infinite loop when advanced mode was selected