Check probably needed. Patch by Andrew Miller