More fixis

Trying different approach.