fixing 0.89.2 bugs [1]