fixed possible future bugs when multiple project will be implemented