Should solve #58