more fixing for #48