Issue 212 (missing tests!)