Forked from - accordion collapse issue