More fix for #46