fix for #1 commit
fix for #2 commit