Fixed Phenogrid issue 37