prev pr + fix 19

see prev pr + fix for mainstream bug 19