Fix #159;