Following patch fixes build for me..