more main fixing