Little update so I could use it in another context.