bugfix for relaxed-mode support