Hopefully it's the last fix to DGrid