Possible fix for #11
Possible fix for #12