Fixed incorrectly instantiated class