Tried to solved #2