Bug fix for my oversight
Merge conflicts