sprite fix
merge