Fixes do issue #2