Fixed bug #224