reverting (hopefully) to version where we have no compiler warnings