Implementing #566