Bug Fix v1.1 for production