Fix #1300 Co-authored-by: m new <michael.burzan@outlook.de> Co-authored-by: Richard Smith <richard@metafoo.co.uk>