[Fix #28]