Bug hotfix, issues #3 + #4