Fix strange ghost issue
Slight refactor