Urgent backporting bugfix

fix for #12