now really fix topic/1503