Oops, fix AttributeError caused by last commit #30