Fixed #238