Hot-fix for D6 based platforms (included also in stable)