Make it more stable