Fixed bug when package name is doubled (Thanks Tome)