Should be more stable now