Bug fixes: the library works for non-dependent objects