I'd like to fix this as a bug rather than part of this pull request if that is ok?