StatusMap related bug fixing