Fix #39