Bug/fix accordion exception