Fix APIMANAGER-3030
Merge pull request #152 from malakasilva/master

Fix APIMANAGER-3030