Improves fix to #70853936, using new syntax now