Final fix for #4