Fix for #135 Issue 135

This attempts to fix issues present in CC 1.5/1.4.7 as well