Adding fix for zoom issue