Hotfix: check for field existance