Adds fix for #47 anyway