fixed stuff for #2