more fixes
1.2.7