Fix for bug #1