Refactored hotfix
Merge pull request #1 from uberVU/hotfix

Refactored hotfix