fixing the issues Chico mentioned