revise previous fix
Merge branch '31-cleanup' into 33