Fix proposal for issue #10

Could solve issue #10