Dummy fixes for the issue #43