Status returns fixed - closes #26