Seems to be more stable now