bug fixes commit 1