fixed latest issues