Fixed handler for VS2013