Twaeks on pull requests # 625 and # 578