resolving issues #143 and #144