Fixing issues #172 and #173. Receivable and payable.