Fix #39 and #40