minor addition+bugfix to previous commit