Make more stable