working on issue366