Fixed ticket 18