Added second version
Added fix