Fix for issue #218 in accounts-entry.