more complex fixes