Fixed issure #6