Fix issues 233