Fixed expand issues