Okay, tests passing, but #138 not fixed well yet