getting rid of issue - fixes 5 , fixes 12 , fixes 14 , fixes 18