Bug fixing 2 issues and regenerated the existing packages

This commit fixes issue #2 and issue #3