#645 – working on me