temporary fix bug 83