Fix #19
Fix #18