Fix #1

This should fix #1 if the fix provided in #1 is accurate.