Attempt to fix #2, but seems like it's blocked by #1