add: Fix element type

Closes gh-606
Fixes gh-309