Verified fix with manual testing. Closes #55