Fix for 'Could not parse account data issue #7'