Fix error with #133 implementation