Fix #15 issue