karandach 58 and 60

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>