Chart fix
merge fix