Fix for stackoverflow =/  oops