Forgot to commit this class before. Related to [#1433]