Fixing mode a bit harder