Prevent layout issues. Fixes #34