fix everythnig