Implement #188

Implement #188