fix before start to work