Fixing 1424 master

fixes #1424 in master for OC5

Reviews welcome @karlitschek @blizzz @MTGap @butonic THX