bug fix
Merge pull request #252 from apatel/ap-last-issues-for-v2-launch

bug fix