Added fix for browser shift issue