Fixes issue 16

Fixes #16
Note to self: check for certification error.