Issue #1588

Let's add this to main shall we?