after merge - stops working ssl error