1.0.3 - better mode handling