Fix for empty Grid