Correct fix for #20