Really solves #2