fix the issues we discussed