Bug Fix

v1.1 bug fix for production