Resolves Issue #5, double entry problem