More fixing for #48