Fixed wrong api usage

Propably fix major part of issues !