Fixed original version