fix #1, hopefully. Revert if not working.