Fixed private methods