More accordion bug fix hackery