removed lwarn, tag, moved inside of if