Fix https issues #2