Fixes T697