Actually fix #126
-Still hacky, but haven't looked at the API yet to see if there's a better way