Fixed wrong indentation in previous merge