Security patch, fixes #1