fix state issues

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>