Try to get it more stable