Avoiding ambiguos column erros when saving, fixes #3803