Rectifying a segmentation fault introduced by 4b35957.