v3.1 bugg fixes