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