This should fix most of #2