Fix #267
Fix #109