this should help futur occurrences of #65