fixes

6.3 added, 12.2 fixed