Merge pull request #833 from diizy/stable-1.1

LB302: further fixes