Fix https issues #4