More better fix than previous fix