Temporary fix for #427