r3 related bugfix