Revert "Revert "Test #20""

This reverts commit cdf2d344def9712cda65ef77e9e91b9281099dcb.