address issues #3