#975 – practically done