More or less fixes #3