Fix issues 265 249