Small fix
More generification