[ALOY-800b] fixes for PR338
Merge pull request #364 from skypanther/ALOY-800b

[ALOY-800b] fixes for PR338