Manual Merge Fixes #2