add check for empty places