updated to fix breaking changes in late September 2013