This seems fishy, but let's leave it like this for now, although I get the feeling stage and state are being mixed too :(