Fixes #5 - Less Fragile Failue