Temp fix for status command