Fixed bug introduced after changing methods