Made a workaround for the issue #501