Try Fix issue #1 and #5