Updating to ensure 0 tiles are returned as nil.