Bug Fix from status class