Fix #227
Fix #226