Some bug fixes on never dim issue #42