Bug Hotfix - issues #3, #4