Bugfix. (Need tests.)