#5 Issue fix