AvdP - Made a hack to avoid double say output