#788 – is it this easy