Final fix for #7