Final fix for #114

Forgot some functions