Bug fix for production V1.1