Fixed bug #376