Added fix1
Added fix2
Added fix1