Revise from p6spy version-1.3