Making dialyzer happy (both in R17 and R15b03-1)