debug & fix?