Fixed empty logic