Fixing merge errors from unmerging #404