Fixed #225