another bug fixes