[SJS-57]: Attempt to solve handshake issue with firefox