LB-32 Fix
Merge pull request #37 from mmiszy/LB-32

LB-32 Fix