Fix problems with update may 15, 2013