Try to solve #40

As suggested by @anjanms
Can be found in #40