more error fixing ; thanks Joshua