Code fix & Chart fix