Hotfix for my client project, need to refactor this ...
client project hotfix