A little change to the mount behaviour here should resolve this: 