Fixed some parsing issues with long filename (bloody nursing)