GM: Implemented fix for broken charts