Possible "fix" for #69