commit with two bug fixes