Fixed #248

6b308c39a166e66fb566fecb0fc190752917aeaa