Hotfix 1

Addressed bug # 1