Added safeguard for private methods