Fixed Phenogrid issue 30