Merge pull request #3370 from rmehta/pos-fix

POS fixes