[z2015] Fixup commit [z2007], My bad. Thx to Reamer for pointing

(based on commit 427fb1e)

Signed-off-by: Nighoo <nighoo@overninethousand.de>

(cleaned version of 3779b0e)

(based on commit [s1621] - b54c0e3)