added fix for bug #259