Additional commit that belong to f9811b9.

Signed-off-by: crynobone <crynobone@gmail.com>