Fix bug I created.
Merge branch 'stable'