Fix #40
Fix #41