Ugly bug fix of 42fd425c63