issue #18, didn't commit part of it, woops