Sample app bug fix