Correct fix for #36