issue #5837 -working as of 10/31/13