FIX: #6520
FIX: deprecated php code