Addresses further issues in #2