Friend fix. Closes #6.