More simple fixing