Reapplying part of 256 fix