bug fixes moore