Fix mentioned by the small guy...