Final fix for #15