#1654: Keeping it together.