issue #4, #5 solve