Fixes on previously closed issues #21 #22