diff --git a/unicodedomino.sty b/unicodedomino.sty
index acfb7ecde41c8473de079fe5e32b0e59483965a5..e3599f3de448bda30bc6d19a5b8f97558aadf418 100644
--- a/unicodedomino.sty
+++ b/unicodedomino.sty
@@ -44,9 +44,6 @@
 \ifx\UTFviii@decode\@undefined%
  \input{unicodedomino_kernel_better_decode.def}%
 \fi%
-\ifx\UTFviii@hexcodepoint\@undefined%
- \input{unicodedomino_kernel_fixup_f4.def}%
-\fi%
 \input{unicodedomino_kernel_cosmetics.def}%
 
 % retrieve the last octet
diff --git a/unicodedomino_compat.def b/unicodedomino_compat.def
index 8e81e8c5cb60f3f042b80784a244b408156fc188..f110a7445a7329129a365eb92e2dec96f347f757 100644
--- a/unicodedomino_compat.def
+++ b/unicodedomino_compat.def
@@ -36,6 +36,8 @@
 
 % added in v1.2e 2018/09/28
 \ifx\UTFviii@hexcodepoint\@undefined%
+ % monkey-patch bugfixes
+ \input{unicodedomino_kernel_fixup_f4.def}%
  % override message to format the codepoint correctly
  \gdef\UTFviii@splitcsname#1:#2\relax{%
   #2 (\expandafter\UTFviii@hexcodepoint\expandafter{%