bug fixes from commit