Hotfix/remove record bug