maybe if !empty instead of the isset?