Fixed #227