@yuhunglin I agree, should probably fixed as part of https://jira.media.berkeley.edu/jira/browse/CLC-946