Fix similar issues 272