fixed Issues