Prospective fix for #12