Fix #9 missed attributes