v2.0.3. Bugfix. Improvement