Fix conflicting state (#13)