Fix # and code