issue #1027 #1028

- onAdd override was unecessary and incorrect