This fixes #1307
This is just doing that and making it compile :) Signed-off-by: Vincent Demeester <vincent@sbr.pm>