fix: Handle stability modifiers correctly as per #6108