boramalper fix for the new API