patch from infernix

Change-Id: I5b1dab29e320580fa32d47d671987473111b8c8e