Fixed #134

It is highly recommended to implement tests for this use case