ugh it's late this is the last fix needed
and some credits
Merge branch 'release/1.2.2'