Fixed issue from github:
* 193