Fixing issue with only 0.11 builds