Hotfix update
Merge pull request #546 from Icenium/ab-261

Hotfix update