Issue1265

Fixes 

https://github.com/getlantern/lantern/issues/1265
https://github.com/getlantern/lantern/issues/1284