[#RO13] Bug commit from Giyhub