Fixing 4416 stable5

fixes #4416 for oc5

@karlitschek @schiesbn @felixboehm THX