Fix #230