Fix gh-693 again, one level deeper
Fix gh-693 again, one level deeper

hellyeahllc/brunch,PeterDaveHello/brunch,kidaa/brunch,brunch/brunch,lalomartins/brunch,justinwoo/brunch,rlugojr/brunch,ondreian/brunch,Flaise/brunch,hayesgm/brunch