Fix for bug #252