constant bug fix
not working, but...