Fix #169