Bug fix for accordion (correctly this time)