This solved #2