reSub fixes