Fixed bug #225 again