Vol 17.fix

worked on VOL-17