This should fix #1 for all that it's worth