Security fix
Fixes #36