Final? stability fix