start of issue fixing