bugfix-spedup