fix aspect issues
merged