Fix for bug #185.