First task

Very little fix