attempt to fix bug 1