Fix for bug #49