Final fix for #129