Temporary fix for #459