Fix for #169 and #165 did not have a clean build.