work on #535