#769 fixed