[IC] repairing problems from last merge
Merge pull request #145 from loadedcommerce/D578

[IC] repairing problems from last merge