Fix #159