#289, #286 comm chart fixes