add known issue and refactor code