better handling of fixtures