Feature/fixing related files

Hopefully fixes #1377 properly