Empty-Check fix