Added !empty to check