Fix #4 Issue again