[FIX] Don't take type into account if status is Empty