open issue 1

open issue 2