Merge pull request #1250 from vss96/sanity_check