Try make it more robust