Ultimate fix for gh-693.
Ultimate fix for gh-693.

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