Fix up last commit so that it works for its intended purpose (use in derived classes)