Bug Fix v1.1

fixed the bug for version 1.1
Merged bug fix from main branch

bug fix for production