Attempted to fix initialization bug...