Tue Jul 22 19:59:40 PDT 2014 fixes bug from bfb37a76ea59534bde0ddb845076e3eb85b5dbb8