correct, but not clean.

[ticket: X]