Fix for bug #23