Adapted to 2.4.17

Signed-off-by: nixnodes <code@nixnodes.net>