Better fix for #43