Fixed default handling to get back assets