Bugfix for prefer_final setting