again bug fixes