one more commit required here to avoid getattr errors