ch. patch and bug fixed