Try Fix issue #1 and issue #5