try to fix bug
slight tweaks.