[36] Small bug fix