fixes two out of three reported in #621 (but not the first one) likely the same issue in #706 and #1003