Merge pull request #121 from phanimahesh/fix-lp-1219318

Fix LP:1219318 by using a sanity check