fixed stability issues