fixed at least one issue