Start of fix to Category Trouble issue #18