Workaround for VisualStudio 2015 bug