fix 7 + debugging 15