Hotfixes Fix Issue #5 

Hotfixes Fix Issue #5