Fix multiple click on step chart - #608