solviong issue #2