basic fix to 0.3 issues #2 and #3