Added experimental fix for bug #214