Fix issue 8

If you deside to fix this, just apply request.