patch 2.1 after some testing