Fixed Phenogrid Issue 36