Fixed silly merge mistake