Fixed Phenogrid Issue 40