fixed !empty