fixes
Merge pull request #68 from lensky84/12516_fixes

12516 fixes