Hotfix/v2.0.2

Hotfixing for 2.0.2