- issues fix