Incorrect nullable composition issue fix