Fixed bug with status