Fix value layout problem