confirm previous fix, remove bug introduced in last commit