same fixes