fixes stability issues