Fixed old code usage