Fixed https://cloudifysource.atlassian.net/browse/RECIPES-4