Fix first half of issue #50 (just one line of code was the problem).