That code is refactored in Ian's branch, so I'll fix this after his branch is merged.