Fixes #904

#884 depends on #904 
Cool - have removed that line in #911