Fix double entries
Merge branch 'feature/81749094_double_entries'