tweak to fix bug