Temporary fix for #621