BUG: Fixed issue in approval component