Changed according to issue 24 on opensslgo