ReturnPath bug fix