Improvement/bugfix to description handling.