INIT: Improve stability