fixed #10, added a field for #23