Fix missing attribute check from 03bd9079