fix for previous commit f85e3c11be8d