Fixed wrong property
Adapted to newest libs