trying further bug fixes