GPTOMCAT-27 - thanks to Ken Siprell for the report and fix