Fixed issue A and B