Fix #272 issue