BUGFIX (now works for realz) also disp update