Fixes #338
I THINK this fixes the remaining cockDescript(99) issues mentioned in #334