Added workaround for better extents for plots