[ issue 15 ] Fixed