Update #15 - Catch some extra cases