Follow up c660ddc4019f2b65bd2587b67f4e2435dff520a9

Special Thanks to Haruna :D
to be rebased

Signed-off-by: shennetsind <ind@henn.et>