Fix https issues #3