Fixed build for latest framework update