Restored double entry fix