[DEV-2] Fixed project