commit using fixes #6
commit using fixes #2