Fix bug in current_state