Feature/212 fix asset