Fix for bug #27