Fixed Phenogrid Issue 31