Issue shows itself when using clang. Refreshed other patch. Signed-off-by: Rosen Penev <rosenp@gmail.com>