modified right side back to old behaviour