Fixing based on new api signature