Fixed (a) & (b) issue