Re: #1257 styling