Added fix for bug #222