Fix#1 Issue