Try a modified implementation of VS2013 version