Fix #226