Make it more reliable