#3205

as @Maniac suggested, change oil earlier and use it