No Skeleton Fix
Merge pull request #476 from adrianolaru/no-skeleton-fix

No Skeleton Fix