Fixing the 'empty field' issue