Fixed issue 67 (Select usage with Expand).