Added fix for Status issue