Reworked statser
Bug fix