Fixed #226