Jarv/gather assets fix