fix assets handling