#373 fixed