Fixes status behavior (still perfetible though)