Fixed a bug on the returning status. Can't believe that mistake was there all this long.