Fix working with