Issue-9 fix