Sparrow fix, try #2