#309 - cosmetic details