Fixed bug #232