Fixed #232