Hotfix Issu #9 and #10