Initially suggested in #263
Initially suggested in #263