Return current status instead of previous one

Probably this is more correct ? Not too sure why we're turing previous status but not the current one