This is the correct fix for bug #41 (finally)