this resolves issues #2 and #3