Closes #924. Another Devilish Bug Vanquished.