Solo part fixed by @Pikotee. Closes #9