Fixed the main issue