Finds a way to fix problem on Chrome
Apply changes from master