Fixed issue in Status handler