#350 real fix for the is empty check