switched to more flexible fix system