Oups => Fixes #1425
Make it more robust