Adding a bit of buffer