Call correct instance methods. Fixes gh-351

Closes gh-354