I think this does the trick, finally.