Fix for bug #01