Fixed empty push check