another patch of scru fixes
another patch of scru fixes