Fix #39, #43