Avoind crashing on posts with short text
Fixing merge conflict.